keep GtkBox as an abstract type and keep _gtk_box_new() as private

2008-10-07 11:03:30  Tim Janik  <timj@imendio.com>

        * gtk/gtkbox.h: keep GtkBox as an abstract type and keep _gtk_box_new()
        as private function until we settle on the exact semantics.
        renamed _gtk_box_set_old_defaults() as suggested by Mitch.

svn path=/trunk/; revision=21599

diff --git a/ChangeLog b/ChangeLog
index 79c3dcebd7d809e0ecea208a5a5bb4d0e510dbcb..3d86438fe8249cea4f5eee06bdccedc4c1f725d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-07 11:03:30  Tim Janik  <timj@imendio.com>
+
+       * gtk/gtkbox.h: keep GtkBox as an abstract type and keep _gtk_box_new()
+       as private function until we settle on the exact semantics.
+       renamed _gtk_box_set_old_defaults() as suggested by Mitch.
+
 2008-10-07  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkbox.c: reindent static prototypes.

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 20c89aa59675ee00d96063154257f4728bd5c5b3..14778ac06939000be88c1770d2a0f4055f06ba35 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -427,7 +427,6 @@ gtk_bin_get_type G_GNUC_CONST
 gtk_box_get_homogeneous
 gtk_box_get_spacing
 gtk_box_get_type G_GNUC_CONST
-gtk_box_new
 gtk_box_pack_end
 gtk_box_pack_start
 #ifndef GTK_DISABLE_DEPRECATED

diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index c2fab0e32c2ab0f901f861a96fc69559f2739b2e..f14224e271e3d09b6dc1f5d3d9e4e9290af4927b 100644 (file)
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -96,10 +96,13 @@ static void gtk_box_get_child_property (GtkContainer   *container,
 static GType gtk_box_child_type        (GtkContainer   *container);
 
 
+#if 0
 G_DEFINE_TYPE_WITH_CODE (GtkBox, gtk_box, GTK_TYPE_CONTAINER,
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE,
-                                                NULL))
-
+                                                NULL));
+#else
+G_DEFINE_ABSTRACT_TYPE (GtkBox, gtk_box, GTK_TYPE_CONTAINER);
+#endif
 
 static void
 gtk_box_class_init (GtkBoxClass *class)
@@ -775,10 +778,10 @@ gtk_box_pack (GtkBox      *box,
  *
  * Since: 2.16
  **/
-GtkWidget *
-gtk_box_new (GtkOrientation orientation,
-             gboolean       homogeneous,
-             gint           spacing)
+GtkWidget*
+_gtk_box_new (GtkOrientation orientation,
+              gboolean       homogeneous,
+              gint           spacing)
 {
   return g_object_new (GTK_TYPE_BOX,
                        "orientation", orientation,
@@ -1170,7 +1173,7 @@ gtk_box_set_child_packing (GtkBox      *box,
 }
 
 void
-_gtk_box_set_default_expand (GtkBox *box)
+_gtk_box_set_old_defaults (GtkBox *box)
 {
   GtkBoxPrivate *private;
 

diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index e9182a1160a1ad27829ce63f886eeb4db00847e6..8167aa93747d9be25e6a81435b2839fa3ca56e40 100644 (file)
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -78,7 +78,7 @@ struct _GtkBoxChild
 
 
 GType       gtk_box_get_type            (void) G_GNUC_CONST;
-GtkWidget * gtk_box_new                 (GtkOrientation  orientation,
+GtkWidget* _gtk_box_new                 (GtkOrientation  orientation,
                                          gboolean        homogeneous,
                                          gint            spacing);
 
@@ -125,7 +125,7 @@ void        gtk_box_set_child_packing   (GtkBox         *box,
                                          GtkPackType     pack_type);
 
 /* internal API */
-void        _gtk_box_set_default_expand (GtkBox         *box);
+void        _gtk_box_set_old_defaults   (GtkBox         *box);
 gboolean    _gtk_box_get_spacing_set    (GtkBox         *box);
 void        _gtk_box_set_spacing_set    (GtkBox         *box,
                                          gboolean        spacing_set);

diff --git a/gtk/gtkhbox.c b/gtk/gtkhbox.c
index b5682f37e6ce351e94e457ac69c2945ee572bb5a..b917c4019d43494a9b700cc02652c52bd3655a7e 100644 (file)
--- a/gtk/gtkhbox.c
+++ b/gtk/gtkhbox.c
@@ -43,7 +43,7 @@ gtk_hbox_init (GtkHBox *hbox)
   gtk_orientable_set_orientation (GTK_ORIENTABLE (hbox),
                                   GTK_ORIENTATION_HORIZONTAL);
 
-  _gtk_box_set_default_expand (GTK_BOX (hbox));
+  _gtk_box_set_old_defaults (GTK_BOX (hbox));
 }
 
 GtkWidget *

diff --git a/gtk/gtkvbox.c b/gtk/gtkvbox.c
index d017a1e26d2c9c8aa37b45dcbf71b20c30e8cd24..4fcd284d6ce7288b5064538f96d7ecdcdb7f59c0 100644 (file)
--- a/gtk/gtkvbox.c
+++ b/gtk/gtkvbox.c
@@ -43,7 +43,7 @@ gtk_vbox_init (GtkVBox *vbox)
   gtk_orientable_set_orientation (GTK_ORIENTABLE (vbox),
                                   GTK_ORIENTATION_VERTICAL);
 
-  _gtk_box_set_default_expand (GTK_BOX (vbox));
+  _gtk_box_set_old_defaults (GTK_BOX (vbox));
 }
 
 GtkWidget *